From f1b9e7c23bec36774bcca93a3d436ae803cf19f6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jun 2019 03:10:13 +0000 Subject: [PATCH] Rename a bunch of private headers We want to follow the convention that all private headers have names ending in private.h --- gtk/gtkactionhelper.c | 2 +- gtk/gtkactionmuxer.c | 4 ++-- gtk/gtkactionobservable.c | 2 +- ...gtkactionobservable.h => gtkactionobservableprivate.h} | 8 ++++---- gtk/gtkactionobserver.c | 2 +- gtk/{gtkactionobserver.h => gtkactionobserverprivate.h} | 6 +++--- gtk/gtkapplication-quartz-menu.c | 2 +- gtk/gtkmenusectionbox.c | 4 ++-- gtk/{gtkmenusectionbox.h => gtkmenusectionboxprivate.h} | 8 ++++---- gtk/gtkmenushell.c | 2 +- gtk/gtkmenushellprivate.h | 2 +- gtk/gtkmenutracker.c | 2 +- gtk/gtkmenutrackeritem.c | 2 +- gtk/{gtkmenutrackeritem.h => gtkmenutrackeritemprivate.h} | 6 +++--- gtk/{gtkmenutracker.h => gtkmenutrackerprivate.h} | 8 ++++---- gtk/gtkmodelbutton.c | 2 +- gtk/gtkmodelmenuitem.c | 2 +- gtk/{gtkmodelmenuitem.h => gtkmodelmenuitemprivate.h} | 8 ++++---- gtk/gtkpopover.c | 2 +- gtk/gtkpopovermenu.c | 4 ++-- gtk/gtkpopovermenubar.c | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) rename gtk/{gtkactionobservable.h => gtkactionobservableprivate.h} (94%) rename gtk/{gtkactionobserver.h => gtkactionobserverprivate.h} (97%) rename gtk/{gtkmenusectionbox.h => gtkmenusectionboxprivate.h} (93%) rename gtk/{gtkmenutrackeritem.h => gtkmenutrackeritemprivate.h} (97%) rename gtk/{gtkmenutracker.h => gtkmenutrackerprivate.h} (95%) rename gtk/{gtkmodelmenuitem.h => gtkmodelmenuitemprivate.h} (90%) diff --git a/gtk/gtkactionhelper.c b/gtk/gtkactionhelper.c index f82b16f012..c5f4356b2b 100644 --- a/gtk/gtkactionhelper.c +++ b/gtk/gtkactionhelper.c @@ -18,7 +18,7 @@ */ #include "gtkactionhelperprivate.h" -#include "gtkactionobservable.h" +#include "gtkactionobservableprivate.h" #include "gtkwidgetprivate.h" #include "gtkdebug.h" diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c index 126c94aa80..72edec793b 100644 --- a/gtk/gtkactionmuxer.c +++ b/gtk/gtkactionmuxer.c @@ -21,8 +21,8 @@ #include "gtkactionmuxerprivate.h" -#include "gtkactionobservable.h" -#include "gtkactionobserver.h" +#include "gtkactionobservableprivate.h" +#include "gtkactionobserverprivate.h" #include "gtkintl.h" #include "gtkmarshalers.h" diff --git a/gtk/gtkactionobservable.c b/gtk/gtkactionobservable.c index ab90df2e59..914f24b052 100644 --- a/gtk/gtkactionobservable.c +++ b/gtk/gtkactionobservable.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtkactionobservable.h" +#include "gtkactionobservableprivate.h" G_DEFINE_INTERFACE (GtkActionObservable, gtk_action_observable, G_TYPE_OBJECT) diff --git a/gtk/gtkactionobservable.h b/gtk/gtkactionobservableprivate.h similarity index 94% rename from gtk/gtkactionobservable.h rename to gtk/gtkactionobservableprivate.h index aa1514b3c9..d82c89729f 100644 --- a/gtk/gtkactionobservable.h +++ b/gtk/gtkactionobservableprivate.h @@ -17,10 +17,10 @@ * Authors: Ryan Lortie */ -#ifndef __GTK_ACTION_OBSERVABLE_H__ -#define __GTK_ACTION_OBSERVABLE_H__ +#ifndef __GTK_ACTION_OBSERVABLE_PRIVATE_H__ +#define __GTK_ACTION_OBSERVABLE_PRIVATE_H__ -#include "gtkactionobserver.h" +#include "gtkactionobserverprivate.h" G_BEGIN_DECLS @@ -57,4 +57,4 @@ void gtk_action_observable_unregister_observer (GtkActi G_END_DECLS -#endif /* __GTK_ACTION_OBSERVABLE_H__ */ +#endif /* __GTK_ACTION_OBSERVABLE_PRIVATE_H__ */ diff --git a/gtk/gtkactionobserver.c b/gtk/gtkactionobserver.c index fda0ae73cc..3a5a9abb19 100644 --- a/gtk/gtkactionobserver.c +++ b/gtk/gtkactionobserver.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtkactionobserver.h" +#include "gtkactionobserverprivate.h" G_DEFINE_INTERFACE (GtkActionObserver, gtk_action_observer, G_TYPE_OBJECT) diff --git a/gtk/gtkactionobserver.h b/gtk/gtkactionobserverprivate.h similarity index 97% rename from gtk/gtkactionobserver.h rename to gtk/gtkactionobserverprivate.h index a4e9659c23..a1a31cc25f 100644 --- a/gtk/gtkactionobserver.h +++ b/gtk/gtkactionobserverprivate.h @@ -17,8 +17,8 @@ * Authors: Ryan Lortie */ -#ifndef __GTK_ACTION_OBSERVER_H__ -#define __GTK_ACTION_OBSERVER_H__ +#ifndef __GTK_ACTION_OBSERVER_PRIVATE_H__ +#define __GTK_ACTION_OBSERVER_PRIVATE_H__ #include @@ -88,4 +88,4 @@ void gtk_action_observer_primary_accel_changed (GtkActi G_END_DECLS -#endif /* __GTK_ACTION_OBSERVER_H__ */ +#endif /* __GTK_ACTION_OBSERVER_PRIVATE_H__ */ diff --git a/gtk/gtkapplication-quartz-menu.c b/gtk/gtkapplication-quartz-menu.c index 0e2567fca7..6478c70d05 100644 --- a/gtk/gtkapplication-quartz-menu.c +++ b/gtk/gtkapplication-quartz-menu.c @@ -21,7 +21,7 @@ #include "config.h" #include "gtkapplicationprivate.h" -#include "gtkmenutracker.h" +#include "gtkmenutrackerprivate.h" #include "gtkicontheme.h" #include "gtktoolbarprivate.h" #include "gtkquartz.h" diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index 47f443b637..0bb33cd68b 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -20,11 +20,11 @@ #include "config.h" -#include "gtkmenusectionbox.h" +#include "gtkmenusectionboxprivate.h" #include "gtkwidgetprivate.h" #include "gtklabel.h" -#include "gtkmenutracker.h" +#include "gtkmenutrackerprivate.h" #include "gtkmodelbutton.h" #include "gtkseparator.h" #include "gtksizegroup.h" diff --git a/gtk/gtkmenusectionbox.h b/gtk/gtkmenusectionboxprivate.h similarity index 93% rename from gtk/gtkmenusectionbox.h rename to gtk/gtkmenusectionboxprivate.h index c5d9772af9..01508fe43a 100644 --- a/gtk/gtkmenusectionbox.h +++ b/gtk/gtkmenusectionboxprivate.h @@ -17,10 +17,10 @@ * Author: Ryan Lortie */ -#ifndef __GTK_MENU_SECTION_BOX_H__ -#define __GTK_MENU_SECTION_BOX_H__ +#ifndef __GTK_MENU_SECTION_BOX_PRIVATE_H__ +#define __GTK_MENU_SECTION_BOX_PRIVATE_H__ -#include +#include #include #include @@ -46,4 +46,4 @@ void gtk_menu_section_box_new_toplevel (GtkPopo G_END_DECLS -#endif /* __GTK_MENU_SECTION_BOX_H__ */ +#endif /* __GTK_MENU_SECTION_BOX_PRIVATE_H__ */ diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index eb3ef71135..55bea7ddb4 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -68,7 +68,7 @@ #include "gtkmenubarprivate.h" #include "gtkmenuitemprivate.h" #include "gtkmnemonichash.h" -#include "gtkmodelmenuitem.h" +#include "gtkmodelmenuitemprivate.h" #include "gtkprivate.h" #include "gtkseparatormenuitem.h" #include "gtktypebuiltins.h" diff --git a/gtk/gtkmenushellprivate.h b/gtk/gtkmenushellprivate.h index 0c42c4d50d..b966e686c3 100644 --- a/gtk/gtkmenushellprivate.h +++ b/gtk/gtkmenushellprivate.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include G_BEGIN_DECLS diff --git a/gtk/gtkmenutracker.c b/gtk/gtkmenutracker.c index 2d39319875..6ec6c5ab07 100644 --- a/gtk/gtkmenutracker.c +++ b/gtk/gtkmenutracker.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtkmenutracker.h" +#include "gtkmenutrackerprivate.h" /*< private > * SECTION:gtkmenutracker diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c index 80bf7116f9..3cd4796e16 100644 --- a/gtk/gtkmenutrackeritem.c +++ b/gtk/gtkmenutrackeritem.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtkmenutrackeritem.h" +#include "gtkmenutrackeritemprivate.h" #include "gtkactionmuxerprivate.h" #include "gtkdebug.h" #include "gtkintl.h" diff --git a/gtk/gtkmenutrackeritem.h b/gtk/gtkmenutrackeritemprivate.h similarity index 97% rename from gtk/gtkmenutrackeritem.h rename to gtk/gtkmenutrackeritemprivate.h index 2f4f04a6fc..0e08f7ecb3 100644 --- a/gtk/gtkmenutrackeritem.h +++ b/gtk/gtkmenutrackeritemprivate.h @@ -17,10 +17,10 @@ * Author: Ryan Lortie */ -#ifndef __GTK_MENU_TRACKER_ITEM_H__ -#define __GTK_MENU_TRACKER_ITEM_H__ +#ifndef __GTK_MENU_TRACKER_ITEM_PRIVATE_H__ +#define __GTK_MENU_TRACKER_ITEM_PRIVATE_H__ -#include "gtkactionobservable.h" +#include "gtkactionobservableprivate.h" #define GTK_TYPE_MENU_TRACKER_ITEM (gtk_menu_tracker_item_get_type ()) #define GTK_MENU_TRACKER_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ diff --git a/gtk/gtkmenutracker.h b/gtk/gtkmenutrackerprivate.h similarity index 95% rename from gtk/gtkmenutracker.h rename to gtk/gtkmenutrackerprivate.h index 35f4a09f7b..210fe2d255 100644 --- a/gtk/gtkmenutracker.h +++ b/gtk/gtkmenutrackerprivate.h @@ -17,10 +17,10 @@ * Author: Ryan Lortie */ -#ifndef __GTK_MENU_TRACKER_H__ -#define __GTK_MENU_TRACKER_H__ +#ifndef __GTK_MENU_TRACKER_PRIVATE_H__ +#define __GTK_MENU_TRACKER_PRIVATE_H__ -#include "gtkmenutrackeritem.h" +#include "gtkmenutrackeritemprivate.h" typedef struct _GtkMenuTracker GtkMenuTracker; @@ -52,4 +52,4 @@ GtkMenuTracker * gtk_menu_tracker_new_for_item_link (GtkMenu void gtk_menu_tracker_free (GtkMenuTracker *tracker); -#endif /* __GTK_MENU_TRACKER_H__ */ +#endif /* __GTK_MENU_TRACKER_PRIVATE_H__ */ diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index ede101df55..57c333536b 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -24,7 +24,7 @@ #include "gtkbutton.h" #include "gtkbuttonprivate.h" #include "gtkwidgetprivate.h" -#include "gtkmenutrackeritem.h" +#include "gtkmenutrackeritemprivate.h" #include "gtkimage.h" #include "gtklabel.h" #include "gtkbox.h" diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c index 5d7637219f..b52e126053 100644 --- a/gtk/gtkmodelmenuitem.c +++ b/gtk/gtkmodelmenuitem.c @@ -19,7 +19,7 @@ #include "config.h" -#include "gtkmodelmenuitem.h" +#include "gtkmodelmenuitemprivate.h" #include "gtkaccellabel.h" #include "gtklabel.h" diff --git a/gtk/gtkmodelmenuitem.h b/gtk/gtkmodelmenuitemprivate.h similarity index 90% rename from gtk/gtkmodelmenuitem.h rename to gtk/gtkmodelmenuitemprivate.h index 8dbdbb0e81..92be6a3f5b 100644 --- a/gtk/gtkmodelmenuitem.h +++ b/gtk/gtkmodelmenuitemprivate.h @@ -17,11 +17,11 @@ * Author: Ryan Lortie */ -#ifndef __GTK_MODEL_MENU_ITEM_H__ -#define __GTK_MODEL_MENU_ITEM_H__ +#ifndef __GTK_MODEL_MENU_ITEM_PRIVATE_H__ +#define __GTK_MODEL_MENU_ITEM_PRIVATE_H__ #include -#include +#include #define GTK_TYPE_MODEL_MENU_ITEM (gtk_model_menu_item_get_type ()) #define GTK_MODEL_MENU_ITEM(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ @@ -37,4 +37,4 @@ GType gtk_model_menu_item_get_type (void) G G_GNUC_INTERNAL GtkWidget * gtk_model_menu_item_new (void); -#endif /* __GTK_MODEL_MENU_ITEM_H__ */ +#endif /* __GTK_MODEL_MENU_ITEM_PRIVATE_H__ */ diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 55db0e23cf..660688836d 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -120,7 +120,7 @@ #include "gtkprivate.h" #include "gtkmain.h" #include "gtkstack.h" -#include "gtkmenusectionbox.h" +#include "gtkmenusectionboxprivate.h" #include "gdk/gdkeventsprivate.h" #include "gtkpointerfocusprivate.h" #include "gtkcssnodeprivate.h" diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c index 3c570c1d45..7e922c6dc1 100644 --- a/gtk/gtkpopovermenu.c +++ b/gtk/gtkpopovermenu.c @@ -20,10 +20,10 @@ #include "gtkstack.h" #include "gtkstylecontext.h" #include "gtkintl.h" -#include "gtkmenusectionbox.h" +#include "gtkmenusectionboxprivate.h" #include "gtkmenubutton.h" #include "gtkactionmuxerprivate.h" -#include "gtkmenutracker.h" +#include "gtkmenutrackerprivate.h" #include "gtkpopoverprivate.h" #include "gtkwidgetprivate.h" #include "gtkeventcontrollerkey.h" diff --git a/gtk/gtkpopovermenubar.c b/gtk/gtkpopovermenubar.c index 023ae4cd42..efbeac4ae4 100644 --- a/gtk/gtkpopovermenubar.c +++ b/gtk/gtkpopovermenubar.c @@ -63,7 +63,7 @@ #include "gtkeventcontrollerkey.h" #include "gtkeventcontrollermotion.h" #include "gtkactionmuxerprivate.h" -#include "gtkmenutracker.h" +#include "gtkmenutrackerprivate.h" #include "gtkwidgetprivate.h" #include "gtkmain.h" #include "gtknative.h" -- 2.30.2